From c4176c97e32d3d4f3545255ab9e162162737eca5 Mon Sep 17 00:00:00 2001 From: Kristian Rietveld Date: Tue, 30 May 2006 09:29:49 +0000 Subject: [PATCH] only check sort column id if connected to sortable model. 2006-05-30 Kristian Rietveld * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_update_button): only check sort column id if connected to sortable model. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ gtk/gtktreeviewcolumn.c | 15 +++++++++++---- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index f3882c233c..bafa3eee6e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-05-30 Kristian Rietveld + + * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_update_button): only + check sort column id if connected to sortable model. + 2006-05-30 Behdad Esfahbod * gdk/gdkpango.c (draw_error_underline): Fix offset to center the diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f3882c233c..bafa3eee6e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2006-05-30 Kristian Rietveld + + * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_update_button): only + check sort column id if connected to sortable model. + 2006-05-30 Behdad Esfahbod * gdk/gdkpango.c (draw_error_underline): Fix offset to center the diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c index 1fe4e3020b..1b22478f21 100644 --- a/gtk/gtktreeviewcolumn.c +++ b/gtk/gtktreeviewcolumn.c @@ -848,6 +848,12 @@ gtk_tree_view_column_update_button (GtkTreeViewColumn *tree_column) GtkWidget *arrow; GtkWidget *current_child; GtkArrowType arrow_type = GTK_ARROW_NONE; + GtkTreeModel *model; + + if (tree_column->tree_view) + model = gtk_tree_view_get_model (GTK_TREE_VIEW (tree_column->tree_view)); + else + model = NULL; /* Create a button if necessary */ if (tree_column->visible && @@ -898,9 +904,10 @@ gtk_tree_view_column_update_button (GtkTreeViewColumn *tree_column) ""); } - if (gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE (GTK_TREE_VIEW (tree_column->tree_view)->priv->model), - &sort_column_id, - NULL)) + if (GTK_IS_TREE_SORTABLE (model) + && gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE (model), + &sort_column_id, + NULL)) { if (sort_column_id == tree_column->sort_column_id) { @@ -944,7 +951,7 @@ gtk_tree_view_column_update_button (GtkTreeViewColumn *tree_column) } g_object_unref (arrow); - if (tree_column->sort_column_id >= 0) + if (GTK_IS_TREE_SORTABLE (model) && tree_column->sort_column_id >= 0) gtk_widget_show (arrow); else gtk_widget_hide (arrow); -- 2.30.2